Merge "Remove disableBackgroundScheduling"
am: a0685c87c8

Change-Id: I0e1f9975c9d8ee5607ca3ce84db5e28e8c3a564a