Merge proposals dependent on lp://staging/~kvalo/indicator-application/dont-unfallback-after-timer-expired

1. dont-unfallback-after-timer-expired
2. Dependent merge proposals