Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr-dev am: e210c99809
am: 768e1df375

* commit '768e1df37559c580ede46574bb1c583b0705375a':
  DO NOT MERGE Fix for syncs being dropped when appIdle is on