am 7788c51d: Merge "Fix onFirstLayout path for saved pages" into ics-mr0

* commit '7788c51d82963a8645655675c675424db694ad85':
  Fix onFirstLayout path for saved pages