Merge "Avoid NPE in app storage page" into qt-dev