Merge "Fix onFirstLayout path for saved pages" into ics-mr0