Merge "Merge "Frameworks: Fix idle-background-job flag" am: 3a16db62ec am: 83419c750f am: 64f4a15a87"