Merge "Revert "add apex-ready event after post-fs-data""