Merge remote-tracking branch 'origin/develop' into develop

res/css/views/rooms/_AppsDrawer.scss

@@ -61,6 +61,10 @@ limitations under the License.
     background-color: $dialog-background-bg-color;
 }
 
+.mx_AppTile_persistedWrapper {
+    height: 280px;
+}
+
 .mx_AppTile:last-child {
     margin-right: 1px;
 }

src/components/views/elements/AppTile.js

@@ -575,9 +575,13 @@ export default class AppTile extends React.Component {
                     // re-mounted later when we do.
                     if (this.props.whitelistCapabilities.includes('m.always_on_screen')) {
                         const PersistedElement = sdk.getComponent("elements.PersistedElement");
-                        appTileBody = <PersistedElement persistKey={this._persistKey}>
-                            {appTileBody}
-                        </PersistedElement>;
+                        // Also wrap the PersistedElement in a div to fix the height, otherwise
+                        // AppTile's border is in the wrong place
+                        appTileBody = <div className="mx_AppTile_persistedWrapper">
+                            <PersistedElement persistKey={this._persistKey}>
+                                {appTileBody}
+                            </PersistedElement>
+                        </div>;
                     }
                 }
             } else {