Merge "fs_mgr: Add stable_inodes flag to encrypted ext4"